284. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:05 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

284.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Filterproducts/templatesside_list.phtml2019-10-28 04:58:26 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_Filterproducts/templatesside_list.phtml2021-02-22 00:45:04 +0000

284.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged9264
Changed617
Inserted00
Removed22

284.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

284.4 Active regular expressions

No regular expressions were active.

284.5 Comparison detail

1 <?php 1 <?php
2 /** 2 /**
3  * Copyright © 2015 Magento. All rights reserved. 3  * Copyright © 2015 Magento. All rights reserved.
4  * See COPYING.txt for license details. 4  * See COPYING.txt for license details.
5  */ 5  */
6 use Magento\Framework\App\Action\Action; 6 use Magento\Framework\App\Action\Action;
7  7 
8 // @codingStandardsIgnoreFile 8 // @codingStandardsIgnoreFile
9 ?> 9 ?>
10 <?php 10 <?php
11 /** 11 /**
12  * Product list template 12  * Product list template
13  * 13  *
14  * @var $block \Smartwave\Filterproducts\Block\ 14  * @var $block \Smartwave\Filterproducts\Block\
15  */ 15  */
16 ?> 16 ?>
17 <?php 17 <?php
18 $_productCollection = $block->getLoadedProductCollection(); 18 $_productCollection = $block->getLoadedProductCollection();
19 $_helper = $this->helper('Magento\Catalog\Helper\Output'); 19 $_helper = $this->helper('Magento\Catalog\Helper\Output');
20 $_imagehelper = $this->helper('Magento\Catalog\Helper\Image'); 20 $_imagehelper = $this->helper('Magento\Catalog\Helper\Image');
21  21 
22 $_portohelper = $this->helper('Smartwave\Porto\Helper\Data'); 22 $_portohelper = $this->helper('Smartwave\Porto\Helper\Data');
23 $review_model = $_portohelper->getModel('\Magento\Review\Model\Review');    
24  23 
25 $_category_config = $_portohelper->getConfig('porto_settings/category'); 24 $_category_config = $_portohelper->getConfig('porto_settings/category');
26 $_category_grid_config = $_portohelper->getConfig('porto_settings/category_grid'); 25 $_category_grid_config = $_portohelper->getConfig('porto_settings/category_grid');
27 $_lazyload = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/optimization/lazyload'); 26 $_lazyload = $this->helper('Smartwave\Porto\Helper\Data')->getConfig('porto_settings/optimization/lazyload');
28  27 
29 $aspect_ratio = $this->getData("aspect_ratio"); 28 $aspect_ratio = $this->getData("aspect_ratio");
30 if($aspect_ratio == null) { 29 if($aspect_ratio == null) {
31     $aspect_ratio = $_category_config['aspect_ratio']; 30     $aspect_ratio = $_category_config['aspect_ratio'];
32 } 31 }
33 $image_width = $this->getData("image_width"); 32 $image_width = $this->getData("image_width");
34 if(!$image_width) { 33 if(!$image_width) {
35     $image_width = ($_category_config['ratio_width'])?$_category_config['ratio_width']:300; 34     $image_width = ($_category_config['ratio_width'])?$_category_config['ratio_width']:300;
36 } 35 }
37 $image_height = $this->getData("image_height"); 36 $image_height = $this->getData("image_height");
38 if($aspect_ratio) 37 if($aspect_ratio)
39     $image_height = $image_width; 38     $image_height = $image_width;
40 if(!$image_height) { 39 if(!$image_height) {
41     $image_height = ($_category_config['ratio_height'])?$_category_config['ratio_height']:300;   40     $image_height = ($_category_config['ratio_height'])?$_category_config['ratio_height']:300;
42 } 41 }
43 ?> 42 ?>
44 <?php if (!$_productCollection->count()): ?> 43 <?php if (!$_productCollection->count()): ?>
45     <div class="message info empty"><div><?php echo __('We can\'t find products matching the selection.') ?></div></div> 44     <div class="message info empty"><div><?php echo __('We can\'t find products matching the selection.') ?></div></div>
46 <?php else: ?> 45 <?php else: ?>
47     <?php 46     <?php
48     $viewMode = 'grid'; 47     $viewMode = 'grid';
49     $image = 'category_page_grid'; 48     $image = 'category_page_grid';
50     $hover_image = 'category_page_grid-hover'; 49     $hover_image = 'category_page_grid-hover';
51     $showDescription = false; 50     $showDescription = false;
52     $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW; 51     $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
53     ?> 52     ?>
54     <div class="products wrapper <?php echo $viewMode; ?> side-list products-<?php echo $viewMode; ?>"> 53     <div class="products wrapper <?php echo $viewMode; ?> small-list products-<?php echo $viewMode; ?>">
55         <?php $iterator = 0; ?> 54         <?php $iterator = 0; ?>
56         <div class="filterproducts products list items product-items owl-carousel
">		 55         <div class="filterproducts products list items product-items owl-carousel mb-0 show-nav-title">
57             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?> 56             <?php /** @var $_product \Magento\Catalog\Model\Product */ ?>
58             <?php foreach ($_productCollection as $_product): ?> 57             <?php foreach ($_productCollection as $_product): ?>
59             <?php if(($iterator % 3) == 0): ?> 58             <?php if(($iterator % 3) == 0): ?>
60             <div class="item"> 59             <div class="item">
61             <?php endif; ?> 60             <?php endif; ?>
62             <?php $iterator ++; ?> 61             <?php $iterator ++; ?>
63                 <div class="product product-item"> 62                 <div class="product product-item">
64                 <div class="product-item-info" data-container="product-grid"> 63                 <div class="product-item-info" data-container="product-grid">
65                     <?php // Product Image ?> 64                     <?php // Product Image ?>
66                     <a href="<?php echo $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1"> 65                     <a href="<?php echo $_product->getProductUrl() ?>" class="product photo product-item-photo" tabindex="-1">
67                         <?php 66                         <?php
68                             if($aspect_ratio) 67                             if($aspect_ratio)
69                                 $productImage = $_imagehelper->init($_product, $image)->constrainOnly(FALSE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($image_width); 68                                 $productImage = $_imagehelper->init($_product, $image)->constrainOnly(FALSE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($image_width);
70                             else 69                             else
71                                 $productImage = $_imagehelper->init($_product, $image)->resize($image_width, $image_height); 70                                 $productImage = $_imagehelper->init($_product, $image)->resize($image_width, $image_height);
72                             $productImageUrl = $productImage->getUrl(); 71                             $productImageUrl = $productImage->getUrl();
73                         ?> 72                         ?>
74                             <img class="product-image-photo default_image <?php if(!$_lazyload): ?>porto-lazyload<?php endif;?>" <?php if(!$_lazyload): ?>data-<?php endif; ?>src="<?php echo $productImageUrl; ?>" width="<?php echo $image_width; ?>" height="<?php echo $image_height; ?>" alt="
"/>		 73                             <img class="product-image-photo default_image <?php if(!$_lazyload): ?>porto-lazyload<?php endif;?>" <?php if(!$_lazyload): ?>data-<?php endif; ?>src="<?php echo $productImageUrl; ?>" width="<?php echo $image_width; ?>" height="<?php echo $image_height; ?>" alt="<?php //echo $productImage->getLabel();?>"/>
75                         <?php if($_category_config['alternative_image']): ?> 74                         <?php if($_category_config['alternative_image']): ?>
76                         <?php 75                         <?php
77                             if($aspect_ratio) 76                             if($aspect_ratio)
78                                 $productHoverImage = $_imagehelper->init($_product, $hover_image)->constrainOnly(FALSE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($image_width); 77                                 $productHoverImage = $_imagehelper->init($_product, $hover_image)->constrainOnly(FALSE)->keepAspectRatio(TRUE)->keepFrame(FALSE)->resize($image_width);
79                             else 78                             else
80                                 $productHoverImage = $_imagehelper->init($_product, $hover_image)->resize($image_width, $image_height); 79                                 $productHoverImage = $_imagehelper->init($_product, $hover_image)->resize($image_width, $image_height);
81                             $productHoverImageUrl = $productHoverImage->getUrl(); 80                             $productHoverImageUrl = $productHoverImage->getUrl();
82                         ?> 81                         ?>
83                             <?php if($productImageUrl != str_replace("/thumbnail/","/small_image/",$productHoverImageUrl)): ?> 82                             <?php if($productImageUrl != str_replace("/thumbnail/","/small_image/",$productHoverImageUrl)): ?>
84                             <img class="product-image-photo hover_image" src="<?php echo $productHoverImageUrl; ?>" alt="
"/>		 83                             <img class="product-image-photo hover_image" src="<?php echo $productHoverImageUrl; ?>" alt="<?php //echo $productHoverImage->getLabel();?>"/>
85                             <?php endif; ?> 84                             <?php endif; ?>
86                         <?php endif; ?> 85                         <?php endif; ?>
87                     </a> 86                     </a>
88                     <div class="product details product-item-details"> 87                     <div class="product details product-item-details">
89                         <?php 88                         <?php
90                             $_productNameStripped = $block->stripTags($_product->getName(), null, true); 89                             $_productNameStripped = $block->stripTags($_product->getName(), null, true);
91                         ?> 90                         ?>
92                         <strong class="product name product-item-name"> 91                         <a href="<?php echo $_product->getProductUrl() ?>"><?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?></a>
93                             <a class="product-item-link"    
94                                href="<?php echo $_product->getProductUrl() ?>">    
95                                 <
?php echo $_helper->productAttribute($_product, $_product->getName(), 'name'); ?>
    
96                             </a>    
97                         </strong>    
98                         <?php if($_category_config['rating_star']): ?> 92                         <?php if($_category_config['rating_star']): ?>
99                         <?php 93                         <?php
100                             $review_model->getEntitySummary($_product);    
101                             $review_html = $block->getReviewsSummaryHtml($_product, $templateType); 94                             $review_html = $block->getReviewsSummaryHtml($_product, $templateType);
102                         ?> 95                         ?>
103                         <?php if($review_html): ?> 96                         <?php if($review_html): ?>
104                             <?php echo $block->getReviewsSummaryHtml($_product, $templateType); ?> 97                             <?php echo $block->getReviewsSummaryHtml($_product, $templateType); ?>
105                         <?php else: ?> 98                         <?php else: ?>
106                         <div class="product-reviews-summary short"> 99                         <div class="product-reviews-summary short">
107                             <div class="rating-summary"> 100                             <div class="rating-summary">
108                                 <span class="label"><span>Rating:</span></span> 101                                 <span class="label"><span>Rating:</span></span>
109                                 <div class="rating-result" title="0%"> 102                                 <div class="rating-result" title="0%">
110                                     <span style="width:0"><span>0%</span></span> 103                                     <span style="width:0"><span>0%</span></span>
111                                 </div> 104                                 </div>
112                             </div> 105                             </div>
113                         </div> 106                         </div>
114                         <?php endif; ?> 107                         <?php endif; ?>
115                         <?php endif; ?> 108                         <?php endif; ?>
116                         <?php if ($showDescription):?> 109                         <?php if ($showDescription):?>
117                             <div class="product description product-item-description"> 110                             <div class="product description product-item-description">
118                                 <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?> 111                                 <?php echo $_helper->productAttribute($_product, $_product->getShortDescription(), 'short_description') ?>
119                                 <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>" 112                                 <a href="<?php echo $_product->getProductUrl() ?>" title="<?php echo $_productNameStripped ?>"
120                                    class="action more"><?php echo __('Learn More') ?></a> 113                                    class="action more"><?php echo __('Learn More') ?></a>
121                             </div> 114                             </div>
122                         <?php endif; ?> 115                         <?php endif; ?>
123                         <?php if($_category_config['product_price']): ?> 116                         <?php if($_category_config['product_price']): ?>
124                         <?php echo $block->getProductPrice($_product) ?> 117                         <?php echo $block->getProductPrice($_product) ?>
125                         <?php endif; ?> 118                         <?php endif; ?>
126                         <?php echo $block->getProductDetailsHtml($_product); ?> 119                         <?php echo $block->getProductDetailsHtml($_product); ?>
127                     </div> 120                     </div>
128                 </div> 121                 </div>
129                 </div> 122                 </div>
130                 <?php if(($iterator % 3) == 0 || $iterator == $_productCollection->count()): ?> 123                 <?php if(($iterator % 3) == 0 || $iterator == $_productCollection->count()): ?>
131                 </div> 124                 </div>
132                 <?php endif; ?> 125                 <?php endif; ?>
133             <?php endforeach; ?> 126             <?php endforeach; ?>
134         </div> 127         </div>
135     </div> 128     </div>
136     <?php if (!$block->isRedirectToCartEnabled()) : ?> 129     <?php if (!$block->isRedirectToCartEnabled()) : ?>
137         <script type="text/x-magento-init"> 130         <script type="text/x-magento-init">
138         { 131         {
139             "[data-role=tocart-form], .form.map.checkout": { 132             "[data-role=tocart-form], .form.map.checkout": {
140                 "catalogAddToCart": {} 133                 "catalogAddToCart": {}
141             } 134             }
142         } 135         }
143         </script> 136         </script>
144     <?php endif; ?> 137     <?php endif; ?>
145 <?php endif; ?> 138 <?php endif; ?>

Araxis Merge (but not the data content of this report) is Copyright © 1993–2019 Araxis Ltd (www.araxis.com). All rights reserved.